From 959fe5eb0e90c73d54c17b998c9d685938d27aaa Mon Sep 17 00:00:00 2001 From: "cl349@firebug.cl.cam.ac.uk" Date: Wed, 4 May 2005 14:05:54 +0000 Subject: [PATCH] bitkeeper revision 1.1389.5.10 (4278d6c2PICykk7zJw1Q6ijXxta3Dw) Fix link order. Signed-off-by: Christian Limpach --- linux-2.6.11-xen-sparse/arch/xen/i386/pci/Makefile | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/linux-2.6.11-xen-sparse/arch/xen/i386/pci/Makefile b/linux-2.6.11-xen-sparse/arch/xen/i386/pci/Makefile index a606c3335b..76c024abfd 100644 --- a/linux-2.6.11-xen-sparse/arch/xen/i386/pci/Makefile +++ b/linux-2.6.11-xen-sparse/arch/xen/i386/pci/Makefile @@ -11,7 +11,8 @@ c-obj-$(CONFIG_PCI_DIRECT) += direct.o c-pci-y := fixup.o c-pci-$(CONFIG_ACPI_PCI) += acpi.o c-pci-y += legacy.o -pci-y += irq.o +# Make sure irq.o gets linked in after legacy.o +l-pci-y += irq.o c-pci-$(CONFIG_X86_VISWS) := visws.o fixup.o pci-$(CONFIG_X86_VISWS) := @@ -26,6 +27,6 @@ c-link := $(patsubst %.o,$(obj)/%.c,$(c-obj-y) $(c-link)): @ln -fsn $(srctree)/arch/i386/pci/$(notdir $@) $@ -obj-y += $(c-obj-y) +obj-y += $(c-obj-y) $(l-pci-y) clean-files += $(patsubst %.o,%.c,$(c-obj-y) $(c-obj-) $(c-link)) -- 2.30.2